Changeset 13903d in indico

Timestamp:

03/28/12 16:48:03 (14 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

8a05806

Parents:

01d3cf

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (03/28/12 16:22:53)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (03/28/12 16:48:03)

Message:

[FIX] Skipping Vidyo tests

• Since they depend on an external server;
• Also changed some imports;

Location:

indico/MaKaC

Files:

• plugins/Collaboration/Vidyo/tests/python/unit/common_test.py (modified) (2 diffs)
• plugins/EPayment/yellowPay/epayment.py (modified) (1 diff)
• plugins/EPayment/yellowPay/webinterface/pages/ePayments.py (modified) (1 diff)
• webinterface/pages/epayments.py (modified) (2 diffs)

indico/MaKaC/plugins/Collaboration/Vidyo/tests/python/unit/common_test.py

@@ -24 +24 @@
 from MaKaC.plugins.Collaboration.Vidyo.tests.python.unit.vidyoTestTools import VidyoTestSetup
 
+import nose
+
 def setUpModule():
     DBMgr.getInstance().startRequest()
@@ -36 +38 @@
 
     def testAdminAPIConnectivity(self):
+        raise nose.SkipTest
         try:
             AdminClient.getInstance()
         except Exception, e:
-            self.fail(msg = _("Could not create a Vidyo AdminClient instance. Exception: ") + str(e))
+            self.fail(msg = "Could not create a Vidyo AdminClient instance. Exception: " + str(e))
 
     def testUserAPIConnectivity(self):
+        raise nose.SkipTest
         try:
             UserClient.getInstance()
         except Exception, e:
-            self.fail(msg = _("Could not create a Vidyo UserClient instance. Exception: ") + str(e))
+            self.fail(msg = "Could not create a Vidyo UserClient instance. Exception: " + str(e))
 
 class TestTypeCreation(unittest.TestCase):

indico/MaKaC/plugins/EPayment/yellowPay/epayment.py

@@ -20 +20 @@
 
 from MaKaC.epayment import BaseEPayMod, BaseTransaction
-import MaKaC.webinterface.urlHandlers as urlHandlers
+from MaKaC.webinterface import urlHandlers
 
 

indico/MaKaC/plugins/EPayment/yellowPay/webinterface/pages/ePayments.py

@@ -19 +19 @@
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-import MaKaC.webinterface.pages.conferences as conferences
-import MaKaC.webinterface.pages.registrationForm as registrationForm
+from MaKaC.webinterface.pages import conferences
+from MaKaC.webinterface.pages import registrationForm
 from MaKaC.webinterface import wcomponents
 from xml.sax.saxutils import quoteattr

indico/MaKaC/webinterface/pages/epayments.py

@@ -19 +19 @@
 ## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-import MaKaC.webinterface.pages.conferences as conferences
-import MaKaC.webinterface.pages.registrationForm as registrationForm
-import MaKaC.webinterface.urlHandlers as urlHandlers
-import MaKaC.webinterface.navigation as navigation
 import string
+
 from MaKaC import epayment
+from MaKaC.webinterface.pages import conferences
+from MaKaC.webinterface.pages import registrationForm
+from MaKaC.webinterface import urlHandlers
+from MaKaC.webinterface import navigation
 from MaKaC.webinterface import wcomponents
 from xml.sax.saxutils import quoteattr
@@ -30 +31 @@
 from datetime import timedelta,datetime
 from MaKaC.webinterface.common.countries import CountryHolder
-import MaKaC.webinterface.pages.registrationForm as registrationForm
+from MaKaC.webinterface.pages import registrationForm
 from MaKaC.conference import Session
 from MaKaC.i18n import _