[Reportbug-commits] r631 - in branches/manual_merge/test (13 files)

[morph-guest at users.alioth.debian.org]

    Date: Saturday, August 16, 2008 @ 22:56:37
  Author: morph-guest
Revision: 631

cherry picking test/ dir

Modified:
  branches/manual_merge/test/scaffold.py
  branches/manual_merge/test/test_checkbuildd.py
  branches/manual_merge/test/test_checkversions.py
  branches/manual_merge/test/test_debianbts.py
  branches/manual_merge/test/test_hiermatch.py
  branches/manual_merge/test/test_rbtempfile.py
  branches/manual_merge/test/test_reportbug.py
  branches/manual_merge/test/test_reportbug_exceptions.py
  branches/manual_merge/test/test_reportbug_submit.py
  branches/manual_merge/test/test_reportbug_ui_newt.py
  branches/manual_merge/test/test_reportbug_ui_text.py
  branches/manual_merge/test/test_reportbug_ui_urwid.py
  branches/manual_merge/test/test_urlutils.py

Modified: branches/manual_merge/test/scaffold.py
===================================================================
--- branches/manual_merge/test/scaffold.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/scaffold.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -20,7 +20,7 @@
     sys.path.insert(1, test_dir)
 if not parent_dir in sys.path:
     sys.path.insert(1, parent_dir)
-bin_dir = parent_dir
+bin_dir = os.path.join(parent_dir, 'bin')
 
 
 def suite(module_name):

Modified: branches/manual_merge/test/test_checkbuildd.py
===================================================================
--- branches/manual_merge/test/test_checkbuildd.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_checkbuildd.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -13,4 +13,4 @@
 
 import scaffold
 
-from reportbuglib import checkbuildd
+from reportbug import checkbuildd

Modified: branches/manual_merge/test/test_checkversions.py
===================================================================
--- branches/manual_merge/test/test_checkversions.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_checkversions.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -13,4 +13,4 @@
 
 import scaffold
 
-from reportbuglib import checkversions
+from reportbug import checkversions

Modified: branches/manual_merge/test/test_debianbts.py
===================================================================
--- branches/manual_merge/test/test_debianbts.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_debianbts.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -13,4 +13,4 @@
 
 import scaffold
 
-from reportbuglib import debianbts
+from reportbug import debianbts

Modified: branches/manual_merge/test/test_hiermatch.py
===================================================================
--- branches/manual_merge/test/test_hiermatch.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_hiermatch.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -13,4 +13,4 @@
 
 import scaffold
 
-from reportbuglib import hiermatch
+from reportbug import hiermatch

Modified: branches/manual_merge/test/test_rbtempfile.py
===================================================================
--- branches/manual_merge/test/test_rbtempfile.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_rbtempfile.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -16,7 +16,7 @@
 import scaffold
 from scaffold import TestCase
 
-from reportbuglib import rbtempfile
+from reportbug import tempfiles as rbtempfile
 
 
 class Test_cleanup_temp_file(TestCase):

Modified: branches/manual_merge/test/test_reportbug.py
===================================================================
--- branches/manual_merge/test/test_reportbug.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_reportbug.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -16,7 +16,7 @@
 import scaffold
 from scaffold import TestCase
 
-from reportbuglib import reportbug
+from reportbug import utils as reportbug
 
 
 class Test_glob_escape(TestCase):

Modified: branches/manual_merge/test/test_reportbug_exceptions.py
===================================================================
--- branches/manual_merge/test/test_reportbug_exceptions.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_reportbug_exceptions.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -13,4 +13,4 @@
 
 import scaffold
 
-from reportbuglib import reportbug_exceptions
+from reportbug import exceptions as reportbug_exceptions

Modified: branches/manual_merge/test/test_reportbug_submit.py
===================================================================
--- branches/manual_merge/test/test_reportbug_submit.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_reportbug_submit.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -13,4 +13,4 @@
 
 import scaffold
 
-from reportbuglib import reportbug_submit
+from reportbug import submit as reportbug_submit

Modified: branches/manual_merge/test/test_reportbug_ui_newt.py
===================================================================
--- branches/manual_merge/test/test_reportbug_ui_newt.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_reportbug_ui_newt.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -13,4 +13,4 @@
 
 import scaffold
 
-from reportbuglib import reportbug_ui_newt
+from reportbug.ui import newt as reportbug_ui_newt

Modified: branches/manual_merge/test/test_reportbug_ui_text.py
===================================================================
--- branches/manual_merge/test/test_reportbug_ui_text.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_reportbug_ui_text.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -13,4 +13,4 @@
 
 import scaffold
 
-from reportbuglib import reportbug_ui_text
+from reportbug.ui import text as reportbug_ui_text

Modified: branches/manual_merge/test/test_reportbug_ui_urwid.py
===================================================================
--- branches/manual_merge/test/test_reportbug_ui_urwid.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_reportbug_ui_urwid.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -14,8 +14,8 @@
 import scaffold
 from scaffold import TestCase
 
-from reportbuglib import reportbug_ui_urwid
-from reportbuglib import reportbug_ui_text
+from reportbug.ui import urwid as reportbug_ui_urwid
+from reportbug.ui import text as reportbug_ui_text
 
 
 class Test_ewrite(TestCase):

Modified: branches/manual_merge/test/test_urlutils.py
===================================================================
--- branches/manual_merge/test/test_urlutils.py	2008-08-16 22:52:52 UTC (rev 630)
+++ branches/manual_merge/test/test_urlutils.py	2008-08-16 22:56:37 UTC (rev 631)
@@ -16,8 +16,8 @@
 import scaffold
 from scaffold import TestCase
 
-from reportbuglib import reportbug_exceptions
-from reportbuglib import urlutils
+from reportbug import exceptions as reportbug_exceptions
+from reportbug import urlutils
 
 
 class StubObject(object):