commit 684f3cba89ec32866edc7037835eec485af5d2a4 · pyrox.dev/nixpkgs

+9 -6

pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py

···

       192
        
                       build_flags=build_flags | {"no_out_link": no_link, "dry_run": dry_run},

     

       193
        
                   )

     

       194
        
       

     

       195
       -
           nix.copy_closure(

     

       196
       -
               path_to_config,

     

       197
       -
               to_host=target_host,

     

       198
       -
               from_host=build_host,

     

       199
       -
               copy_flags=copy_flags,

     

       200
       -
           )

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       201
        
       

     

       202
        
           return path_to_config

     

       203

···

       192
        
                       build_flags=build_flags | {"no_out_link": no_link, "dry_run": dry_run},

     

       193
        
                   )

     

       194
        
       

     

       195
       +
           # In dry_run mode there is nothing to copy

     

       196
       +
           # https://github.com/NixOS/nixpkgs/issues/444156

     

       197
       +
           if not dry_run:

     

       198
       +
               nix.copy_closure(

     

       199
       +
                   path_to_config,

     

       200
       +
                   to_host=target_host,

     

       201
       +
                   from_host=build_host,

     

       202
       +
                   copy_flags=copy_flags,

     

       203
       +
               )

     

       204
        
       

     

       205
        
           return path_to_config

     

       206

+68

pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_main.py

···

       986
        
       

     

       987
        
       

     

       988
        
       @patch("subprocess.run", autospec=True)

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       989
        
       def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None:

     

       990
        
           config_path = tmp_path / "test"

     

       991
        
           config_path.touch()

···

       986
        
       

     

       987
        
       

     

       988
        
       @patch("subprocess.run", autospec=True)

     

       989
       +
       def test_execute_build_dry_run_build_and_target_remote(

     

       990
       +
           mock_run: Mock, tmp_path: Path

     

       991
       +
       ) -> None:

     

       992
       +
           config_path = tmp_path / "test"

     

       993
       +
           config_path.touch()

     

       994
       +
           mock_run.side_effect = [

     

       995
       +
               CompletedProcess([], 0, str(config_path)),

     

       996
       +
               CompletedProcess([], 0),

     

       997
       +
               CompletedProcess([], 0, str(config_path)),

     

       998
       +
           ]

     

       999
       +
       

     

       1000
       +
           nr.execute(

     

       1001
       +
               [

     

       1002
       +
                   "nixos-rebuild",

     

       1003
       +
                   "dry-build",

     

       1004
       +
                   "--flake",

     

       1005
       +
                   "/path/to/config#hostname",

     

       1006
       +
                   "--build-host",

     

       1007
       +
                   "user@build-host",

     

       1008
       +
                   "--target-host",

     

       1009
       +
                   "user@target-host",

     

       1010
       +
               ]

     

       1011
       +
           )

     

       1012
       +
       

     

       1013
       +
           assert mock_run.call_count == 3

     

       1014
       +
           mock_run.assert_has_calls(

     

       1015
       +
               [

     

       1016
       +
                   call(

     

       1017
       +
                       [

     

       1018
       +
                           "nix",

     

       1019
       +
                           "--extra-experimental-features",

     

       1020
       +
                           "nix-command flakes",

     

       1021
       +
                           "eval",

     

       1022
       +
                           "--raw",

     

       1023
       +
                           '/path/to/config#nixosConfigurations."hostname".config.system.build.toplevel.drvPath',

     

       1024
       +
                       ],

     

       1025
       +
                       check=True,

     

       1026
       +
                       stdout=PIPE,

     

       1027
       +
                       **DEFAULT_RUN_KWARGS,

     

       1028
       +
                   ),

     

       1029
       +
                   call(

     

       1030
       +
                       ["nix-copy-closure", "--to", "user@build-host", config_path],

     

       1031
       +
                       check=True,

     

       1032
       +
                       **DEFAULT_RUN_KWARGS,

     

       1033
       +
                   ),

     

       1034
       +
                   call(

     

       1035
       +
                       [

     

       1036
       +
                           "ssh",

     

       1037
       +
                           *nr.process.SSH_DEFAULT_OPTS,

     

       1038
       +
                           "user@build-host",

     

       1039
       +
                           "--",

     

       1040
       +
                           "nix",

     

       1041
       +
                           "--extra-experimental-features",

     

       1042
       +
                           "'nix-command flakes'",

     

       1043
       +
                           "build",

     

       1044
       +
                           f"'{config_path}^*'",

     

       1045
       +
                           "--print-out-paths",

     

       1046
       +
                           "--dry-run",

     

       1047
       +
                       ],

     

       1048
       +
                       check=True,

     

       1049
       +
                       stdout=PIPE,

     

       1050
       +
                       **DEFAULT_RUN_KWARGS,

     

       1051
       +
                   ),

     

       1052
       +
               ]

     

       1053
       +
           )

     

       1054
       +
       

     

       1055
       +
       

     

       1056
       +
       @patch("subprocess.run", autospec=True)

     

       1057
        
       def test_execute_test_flake(mock_run: Mock, tmp_path: Path) -> None:

     

       1058
        
           config_path = tmp_path / "test"

     

       1059
        
           config_path.touch()