PR#1483: Stop copying .git directory with module defaults - pungi

Haibo Lin • 3 years ago

f518c1b

pungi/phases/init.py

file modified

+3 -1

		`@@ -212,7 +212,9 @@`
		`get_dir_from_scm(scm_dict, tmp_dir, compose=compose)`
		`compose.log_debug("Writing module defaults")`
		`shutil.copytree(`
		`- tmp_dir, compose.paths.work.module_defaults_dir(create_dir=False)`
		`+ tmp_dir,`
		`+ compose.paths.work.module_defaults_dir(create_dir=False),`
		`+ ignore=shutil.ignore_patterns(".git"),`
		`)`

tests/test_initphase.py

file modified

+7 -3

		`@@ -529,10 +529,11 @@`
		`)`


		`+ @mock.patch("shutil.ignore_patterns")`
		`@mock.patch("shutil.copytree")`
		`@mock.patch("pungi.phases.init.get_dir_from_scm")`
		`class TestWriteModuleDefaults(PungiTestCase):`
		`- def test_clone_git(self, gdfs, ct):`
		`+ def test_clone_git(self, gdfs, ct, igp):`
		`conf = {"scm": "git", "repo": "https://pagure.io/pungi.git", "dir": "."}`
		`compose = DummyCompose(self.topdir, {"module_defaults_dir": conf})`

		`@@ -547,11 +548,12 @@`
		`mock.call(`
		`gdfs.call_args_list[0][0][1],`
		`os.path.join(self.topdir, "work/global/module_defaults"),`
		`+ ignore=igp(".git"),`
		`)`
		`],`
		`)`

		`- def test_clone_file_scm(self, gdfs, ct):`
		`+ def test_clone_file_scm(self, gdfs, ct, igp):`
		`conf = {"scm": "file", "dir": "defaults"}`
		`compose = DummyCompose(self.topdir, {"module_defaults_dir": conf})`
		`compose.config_dir = "/home/releng/configs"`
		`@@ -574,11 +576,12 @@`
		`mock.call(`
		`gdfs.call_args_list[0][0][1],`
		`os.path.join(self.topdir, "work/global/module_defaults"),`
		`+ ignore=igp(".git"),`
		`)`
		`],`
		`)`

		`- def test_clone_file_str(self, gdfs, ct):`
		`+ def test_clone_file_str(self, gdfs, ct, igp):`
		`conf = "defaults"`
		`compose = DummyCompose(self.topdir, {"module_defaults_dir": conf})`
		`compose.config_dir = "/home/releng/configs"`
		`@@ -595,6 +598,7 @@`
		`mock.call(`
		`gdfs.call_args_list[0][0][1],`
		`os.path.join(self.topdir, "work/global/module_defaults"),`
		`+ ignore=igp(".git"),`
		`)`
		`],`
		`)`