[Fusionforge-commits] r10221 - in trunk/tests/func: . Soap
Alain Peyrat
aljeux at libremir.placard.fr.eu.org
Fri Jul 9 21:09:49 CEST 2010
Author: aljeux
Date: 2010-07-09 21:09:49 +0200 (Fri, 09 Jul 2010)
New Revision: 10221
Modified:
trunk/tests/func/Soap/checks.php
trunk/tests/func/Soap/login.php
trunk/tests/func/Soap/usergroup.php
trunk/tests/func/config.php.sample
Log:
Tests: Add missing HOST definition (added when refactoring RPM) and merged FORGE_HOSTNAME => HOST
Modified: trunk/tests/func/Soap/checks.php
===================================================================
--- trunk/tests/func/Soap/checks.php 2010-07-09 12:49:53 UTC (rev 10220)
+++ trunk/tests/func/Soap/checks.php 2010-07-09 19:09:49 UTC (rev 10221)
@@ -32,8 +32,8 @@
function testHostnameResolves()
{
- $ip = gethostbyname(FORGE_HOSTNAME);
- $this->assertNotEquals(FORGE_HOSTNAME, $ip);
+ $ip = gethostbyname(HOST);
+ $this->assertNotEquals(HOST, $ip);
}
Modified: trunk/tests/func/Soap/login.php
===================================================================
--- trunk/tests/func/Soap/login.php 2010-07-09 12:49:53 UTC (rev 10220)
+++ trunk/tests/func/Soap/login.php 2010-07-09 19:09:49 UTC (rev 10221)
@@ -40,8 +40,8 @@
// resolving the hostname doesn't work under phpunit. If
// this fails, the hostname and IP address should be
// different and the WSDL retrieval should work
- $ip = gethostbyname(FORGE_HOSTNAME);
- if ($ip != FORGE_HOSTNAME)
+ $ip = gethostbyname(HOST);
+ if ($ip != HOST)
{
// Instantiate the SOAP client with WSDL
Modified: trunk/tests/func/Soap/usergroup.php
===================================================================
--- trunk/tests/func/Soap/usergroup.php 2010-07-09 12:49:53 UTC (rev 10220)
+++ trunk/tests/func/Soap/usergroup.php 2010-07-09 19:09:49 UTC (rev 10221)
@@ -34,8 +34,8 @@
// try {
// see comments in SoapLoginProcess:setup() for details about this
- $ip = gethostbyname(FORGE_HOSTNAME);
- if ($ip != FORGE_HOSTNAME)
+ $ip = gethostbyname(HOST);
+ if ($ip != HOST)
{
$this->soapclient = new SoapClient(WSDL_URL,
Modified: trunk/tests/func/config.php.sample
===================================================================
--- trunk/tests/func/config.php.sample 2010-07-09 12:49:53 UTC (rev 10220)
+++ trunk/tests/func/config.php.sample 2010-07-09 19:09:49 UTC (rev 10221)
@@ -14,9 +14,10 @@
define ('SELENIUM_RC_HOST', 'localhost');
// The forge's hostname
-define ('FORGE_HOSTNAME', 'test.local');
+define ('HOST', 'centos52.local');
// Base URL where FusionForge is installed
+define ('ROOT', '');
define ('BASE', '');
// Database connection parameters.
@@ -41,7 +42,7 @@
// These are deduced from the previous definitions.
// URL to access the application
-define ('URL', 'http://'.FORGE_HOSTNAME.'/');
+define ('URL', 'http://'.HOST.'/');
// WSDL of the forges SOAP API
define ('WSDL_URL', URL.'soap/index.php?wsdl');
More information about the Fusionforge-commits
mailing list