[Pkg-bazaar-commits] ./bzr-builddeb/trunk.old r262: Fix test failure fallout.

[James Westby]

------------------------------------------------------------
revno: 262
committer: James Westby <jw+debian at jameswestby.net>
branch nick: 2.0
timestamp: Wed 2008-08-27 22:18:08 +0100
message:
  Fix test failure fallout.
modified:
  __init__.py
  tests/blackbox/test_import_dsc.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-08-27 21:06:59 +0000
+++ b/__init__.py	2008-08-27 21:18:08 +0000
@@ -404,7 +404,8 @@
     distribution_opt = Option('distribution', help="The distribution that "
             "this release is targetted at", type=str)
 
-    takes_options = [package_opt, no_user_conf_opt]
+    takes_options = [package_opt, no_user_conf_opt, version_opt,
+            distribution_opt]
 
     def run(self, tarball, version=None, distribution=None, package=None,
             no_user_config=None):
@@ -517,9 +518,9 @@
                           "packages to import.", type=str, argname="filename",
                           short_name='F')
     distribution_opt = Option('distribution', help="The distribution that "
-            "these packages were uploaded to.")
+            "these packages were uploaded to.", type=str)
 
-    takes_options = [filename_opt]
+    takes_options = [filename_opt, distribution_opt]
 
     def import_many(self, db, files_list, orig_target):
         cache = DscCache()

=== modified file 'tests/blackbox/test_import_dsc.py'
--- a/tests/blackbox/test_import_dsc.py	2008-08-27 16:59:55 +0000
+++ b/tests/blackbox/test_import_dsc.py	2008-08-27 21:18:08 +0000
@@ -77,7 +77,7 @@
   def test_import_dsc(self):
     self.make_real_source_package()
     tree = self.make_branch_and_tree('.')
-    self.run_bzr('import-dsc debian %s' % self.dsc_name)
+    self.run_bzr('import-dsc --distribution debian %s' % self.dsc_name)
     tree.lock_read()
     try:
       self.check_inventory_shape(tree.inventory,
@@ -86,11 +86,18 @@
       tree.unlock()
     self.assertEqual(len(tree.branch.revision_history()), 2)
 
-  def test_import_incremental_no_files(self):
+  def test_import_no_files(self):
     self.make_branch_and_tree('.')
     self.make_real_source_package()
     self.run_bzr_error(['You must give the location of at least one source '
-        'package.'], 'import-dsc debian')
+        'package.'], 'import-dsc --distribution debian')
+
+  def test_import_no_distribution(self):
+    self.make_branch_and_tree('.')
+    self.make_real_source_package()
+    self.run_bzr_error(['You must specify the distribution these packages '
+            'were uploaded to using --distribution.'],
+            'import-dsc %s' % self.dsc_name)
 
 # vim: ts=2 sts=2 sw=2