pyrox.dev / nixpkgs
lol
fork atom

nixos/test-driver: always respect --dump-vsock

Before, the vsocks the test-run will use were only printed in
interactive mode. However, with `enableDebugHook = true;` this
functionality can also be used via `breakpointHook` within the build
sandbox, i.e. in the non-interactive mode.

I misremembered how much effort this is to fix, otherwise, I would've
added this to #422066 already ;)

Maximilian Bosch 9b1025c7 febe951b

options
unified split
Changed files
+2 -2
nixos
lib
test-driver
src
test_driver
__init__.py
+2 -2
nixos/lib/test-driver/src/test_driver/__init__.py 
···

       
148

       
148

       
 

       
        args.global_timeout,


     

       
149

       
149

       
 

       
        debug=debugger,


     

       
150

       
150

       
 

       
    ) as driver:


     

       

       
151

       
+

       
        if offset := args.dump_vsocks:


     

       

       
152

       
+

       
            driver.dump_machine_ssh(offset)


     

       
151

       
153

       
 

       
        if args.interactive:


     

       
152

       
154

       
 

       
            history_dir = os.getcwd()


     

       
153

       
155

       
 

       
            history_path = os.path.join(history_dir, ".nixos-test-history")


     

       
154

       

       
-

       
            if offset := args.dump_vsocks:


     

       
155

       

       
-

       
                driver.dump_machine_ssh(offset)


     

       
156

       
156

       
 

       
            ptpython.ipython.embed(


     

       
157

       
157

       
 

       
                user_ns=driver.test_symbols(),


     

       
158

       
158

       
 

       
                history_filename=history_path,