Verified Commit 6e1e69bd authored by Ramon Nou's avatar Ramon Nou Committed by Marc Vef
Browse files

rebase errors

parent cb1f9344

tests/integration/harness/CMakeLists.txt

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ add_executable(gkfs.io 
    gkfs.io/dup_validate.cpp

    gkfs.io/syscall_coverage.cpp

    gkfs.io/rename.cpp

    gkfs.io/unlink.cpp

)



include(FetchContent)

tests/integration/harness/gkfs.io/commands.hpp

+4 −1
Original line number Diff line number Diff line
@@ -116,7 +116,6 @@ symlink_init(CLI::App& app); 


void

unlink_init(CLI::App& app);

rename_init(CLI::App& app);



void

dup_validate_init(CLI::App& app);
@@ -124,4 +123,8 @@ dup_validate_init(CLI::App& app); 
void

syscall_coverage_init(CLI::App& app);



void

rename_init(CLI::App& app);





#endif // IO_COMMANDS_HPP

tests/integration/harness/gkfs.io/main.cpp

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ init_commands(CLI::App& app) { 
    dup_validate_init(app);

    syscall_coverage_init(app);

    rename_init(app);

    unlink_init(app);

}

tests/integration/harness/io.py

+2 −11
Original line number Diff line number Diff line
@@ -474,15 +474,6 @@ class RenameOutputSchema(Schema): 
    def make_object(self, data, **kwargs):

        return namedtuple('RenameReturn', ['retval', 'errno'])(**data)



class UnlinkOutputSchema(Schema):

    """Schema to deserialize the results of an unlink() execution"""

    retval = fields.Integer(required=True)

    errno = Errno(data_key='errnum', required=True)



    @post_load

    def make_object(self, data, **kwargs):

        return namedtuple('UnlinkReturn', ['retval', 'errno'])(**data)



class IOParser:



    OutputSchemas = {
@@ -509,6 +500,7 @@ class IOParser: 
        'unlink'  : UnlinkOutputSchema(),

        'access' : AccessOutputSchema(),

        'statfs' : StatfsOutputSchema(),

        'rename' : RenameOutputSchema(),

        # UTIL

        'file_compare': FileCompareOutputSchema(),

        'chdir'   : ChdirOutputSchema(),
@@ -516,8 +508,7 @@ class IOParser: 
        'symlink' : SymlinkOutputSchema(),

        'dup_validate' : DupValidateOutputSchema(),

        'syscall_coverage' : SyscallCoverageOutputSchema(),

        'rename' : RenameOutputSchema(),

        'unlink' : UnlinkOutputSchema(),

        

    }



    def parse(self, command, output):