← Back to branch summary

~jelmer/bzr-git/index-based

« back to all changes in this revision

Viewing changes to tests/test_blackbox.py

  • Committer: Jelmer Vernooij
  • Date: 2010-06-23 19:07:06 UTC
  • mfrom: (677.7.182 trunk)
  • Revision ID: jelmer@samba.org-20100623190706-t2mqoj2o304ni80f
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_blackbox.py
48
48
        dir = BzrDir.open(self.test_dir)
49
49
        dir.create_branch()
50
50
        output, error = self.run_bzr(['nick'])
51
 
        self.assertEquals("master\n", output)
 
51
        self.assertEquals("HEAD\n", output)
52
52
 
53
53
    def test_info(self):
54
54
        self.simple_commit()
55
55
        output, error = self.run_bzr(['info'])
56
56
        self.assertEqual(error, '')
57
 
        self.assertTrue("Repository branch (format: git)" in output)
 
57
        self.assertTrue("Standalone tree (format: git)" in output)
58
58
 
59
59
    def test_branch(self):
60
60
        os.mkdir("gitbranch")
83
83
 
84
84
        output, error = self.run_bzr(['info', '-v'])
85
85
        self.assertEqual(error, '')
86
 
        self.assertTrue("Repository branch (format: git)" in output)
 
86
        self.assertTrue("Standalone tree (format: git)" in output)
87
87
        self.assertTrue("control: Local Git Repository" in output)
88
88
        self.assertTrue("branch: Git Branch" in output)
89
89
        self.assertTrue("repository: Git Repository" in output)
93
93
        GitRepo.init(os.path.join(self.test_dir, "bla"))
94
94
        self.run_bzr(['init', 'foo'])
95
95
        self.run_bzr(['commit', '--unchanged', '-m', 'bla', 'foo'])
96
 
        output, error = self.run_bzr(['push', '-d', 'foo', 'bla'], retcode=3)
97
 
        self.assertEquals('bzr: ERROR: Push is not yet supported for bzr-git. Try dpush instead.\n', error)
 
96
        output, error = self.run_bzr(['push', '-d', 'foo', 'bla'])
98
97
        self.assertEquals("", output)
 
98
        self.assertTrue(error.endswith("Created new branch.\n"))
99
99
 
100
100
    def test_log(self):
101
101
        # Smoke test for "bzr log" in a git repository.
134
134
    def test_init_repo(self):
135
135
        output, error = self.run_bzr(["init-repo", "--git", "bla.git"])
136
136
        self.assertEquals(error, '')
137
 
        self.assertEquals(output, 'Shared repository with trees (format: git)\nLocation:\n  shared repository: bla.git\n')
 
137
        self.assertEquals(output, 'Unshared repository with trees (format: git)\nLocation:\n  repository: bla.git\n')
138
138