Revert "WIP: More test reverts.. TODO: understand 'class DebianGitTes…

…tRepo'" This reverts commit 2fef23b0bde35d2896d955c4a0e7dd865474a4b3.
agx · Jan 12, 2024 · 2d887d7 · 2d887d7
1 parent d089ffe
commit 2d887d7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/tests/13_test_gbp_pq.py b/tests/13_test_gbp_pq.py
@@ -158,7 +158,7 @@ def _test_generate_patches(self, changes, expected_patches, opts):
         for expected in expected_paths:
             self.repo.apply_patch(expected)
         self.repo.commit_all("foo")
-        diff = self.repo.diff('master', 'testapply')
+        diff = self.repo.diff('debian/latest', 'testapply')
         # Branches must be identical afterwards
         self.assertEqual(b'', diff)
 

diff --git a/tests/22_test_gbp_buildpackage.py b/tests/22_test_gbp_buildpackage.py
@@ -35,7 +35,7 @@ def test_get_pbuilder_dist_dep14_debian_sid(self, patch):
 
     @patch('gbp.deb.get_vendor', return_value='Debian')
     def test_get_pbuilder_dist_dep14_debian_master(self, patch):
-        branch = 'debian/latest'
+        branch = 'debian/debian/latest'
         self.repo.create_branch(branch)
         self.repo.set_branch(branch)
         self.assertEqual(get_pbuilder_dist(self.options, self.repo), '')

diff --git a/tests/24_test_gbp_import_orig.py b/tests/24_test_gbp_import_orig.py
@@ -85,7 +85,7 @@ def testDebianDir(self):
         self.repo.set_branch("upstream")
         self.add_file("upstream_file")
         self.add_file("debian/changelog")
-        self.repo.set_branch("master")
+        self.repo.set_branch("debian/latest")
         self.repo.create_tag('upstream/1.0', "Upstream 1.0", "upstream")
         debian_branch_merge_by_replace(self.repo, "upstream/1.0", "1.0", self)
         self.assertTrue(os.path.exists("debian/control"))