~ubuntu-branches/debian/jessie/bzr-fastimport/jessie

« back to all changes in this revision

Viewing changes to tests/test_commands.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2011-04-28 16:16:34 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20110428161634-zh6yosxj56ncskv9
Tags: 0.10.0+bzr317-1
* New upstream snapshot.
 + Fixes 'bzr fast-import' command. LP: #736681

Show diffs side-by-side

added added

removed removed

Lines of Context:
76
76
        tree.commit("pointless")
77
77
        data = self.run_bzr("fast-export br br.fi")[0]
78
78
        self.assertEquals("", data)
79
 
        self.failUnlessExists("br.fi")
 
79
        try:
 
80
            self.assertPathExists("br.fi")
 
81
        except AttributeError: # bzr < 2.4
 
82
            self.failUnlessExists("br.fi")
80
83
 
81
84
 
82
85
simple_fast_import_stream = """commit refs/heads/master
118
121
\t[':1']\trefs/heads/master
119
122
Merges:
120
123
""")
 
124
 
 
125
 
 
126
class TestFastImport(ExternalBase):
 
127
 
 
128
    def test_empty(self):
 
129
        self.build_tree_contents([('empty.fi', "")])
 
130
        self.make_branch_and_tree("br")
 
131
        self.assertEquals("", self.run_bzr("fast-import empty.fi br")[0])
 
132
 
 
133
    def test_file(self):
 
134
        tree = self.make_branch_and_tree("br")
 
135
        self.build_tree_contents([('file.fi', simple_fast_import_stream)])
 
136
        data = self.run_bzr("fast-import file.fi br")[0]
 
137
        self.assertEquals(1, tree.branch.revno())