From 220c31651d859cd7b985b6b30e3802f3f6e3320c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Krier?= Date: Fri, 23 Nov 2012 13:44:32 +0100 Subject: [PATCH] Fix url tests as hostname is fixed --- trytond/tests/test_mixins.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/trytond/tests/test_mixins.py b/trytond/tests/test_mixins.py index fe728881b3..2bae2251bf 100644 --- a/trytond/tests/test_mixins.py +++ b/trytond/tests/test_mixins.py @@ -4,13 +4,12 @@ #this repository contains the full copyright notices and license terms. import unittest -import socket import urllib -from trytond.config import CONFIG from trytond.tests.test_tryton import (POOL, DB_NAME, USER, CONTEXT, install_module) from trytond.transaction import Transaction +from trytond.url import HOSTNAME class UrlTestCase(unittest.TestCase): @@ -20,7 +19,7 @@ class UrlTestCase(unittest.TestCase): install_module('test') self.urlmodel = POOL.get('test.urlobject') self.urlwizard = POOL.get('test.test_wizard', type='wizard') - self.hostname = socket.getfqdn() + self.hostname = HOSTNAME def testModelURL(self): "Test model URLs" @@ -29,30 +28,17 @@ class UrlTestCase(unittest.TestCase): 'tryton://%s/%s/model/test.urlobject' % (self.hostname, urllib.quote(DB_NAME))) - server_name = 'michaelscott.paper.test' - CONFIG['hostname_jsonrpc'] = server_name - self.assertEqual(self.urlmodel.__url__, - 'tryton://%s/%s/model/test.urlobject' % (server_name, - urllib.quote(DB_NAME))) - self.assertEqual(self.urlmodel(1).__url__, - 'tryton://%s/%s/model/test.urlobject/1' % (server_name, + 'tryton://%s/%s/model/test.urlobject/1' % (self.hostname, urllib.quote(DB_NAME))) def testWizardURL(self): "Test wizard URLs" with Transaction().start(DB_NAME, USER, context=CONTEXT): - CONFIG['hostname_jsonrpc'] = None self.assertEqual(self.urlwizard.__url__, 'tryton://%s/%s/wizard/test.test_wizard' % (self.hostname, urllib.quote(DB_NAME))) - server_name = 'michaelscott.paper.test' - CONFIG['hostname_jsonrpc'] = server_name - self.assertEqual(self.urlwizard.__url__, - 'tryton://%s/%s/wizard/test.test_wizard' % (server_name, - urllib.quote(DB_NAME))) - def suite(): func = unittest.TestLoader().loadTestsFromTestCase