Run all GeoNode tests locally, but skip ones which rely on a remote server on Travis

nyalldawson · nyalldawson · commit e6a8980b976b · 2017-09-13T05:47:53.000+10:00
diff --git a/tests/src/core/testqgsgeonodeconnection.cpp b/tests/src/core/testqgsgeonodeconnection.cpp
@@ -65,8 +65,6 @@ class TestQgsGeoNodeConnection: public QObject
 
     QString mKartozaGeoNodeGeoServerName;
     QString mKartozaGeoNodeGeoServerURL;
-
-    bool mSkipRemoteTest;
 };
 
 // Runs before all unit tests
@@ -82,9 +80,6 @@ void TestQgsGeoNodeConnection::initTestCase()
   mKartozaGeoNodeGeoServerName = QStringLiteral( "Staging Kartoza GeoNode GeoServer" );
   mKartozaGeoNodeGeoServerURL = QStringLiteral( "http://staginggs.geonode.kartoza.com" );
 
-  // Change it to skip remote testing
-  mSkipRemoteTest = true;
-
   // Add Demo GeoNode Connection
   QgsSettings settings;
 
@@ -99,7 +94,7 @@ void TestQgsGeoNodeConnection::initTestCase()
 // Test the creation of geonode connection
 void TestQgsGeoNodeConnection::testCreation()
 {
-  if ( mSkipRemoteTest )
+  if ( QgsTest::isTravis() )
   {
     QSKIP( "Skip remote test for faster testing" );
   }
@@ -128,7 +123,7 @@ void TestQgsGeoNodeConnection::testCreation()
 // Test Layer API
 void TestQgsGeoNodeConnection::testLayerAPI()
 {
-  if ( mSkipRemoteTest )
+  if ( QgsTest::isTravis() )
   {
     QSKIP( "Skip remote test for faster testing" );
   }
@@ -143,7 +138,7 @@ void TestQgsGeoNodeConnection::testLayerAPI()
 // Test Style API
 void TestQgsGeoNodeConnection::testStyleAPI()
 {
-  if ( mSkipRemoteTest )
+  if ( QgsTest::isTravis() )
   {
     QSKIP( "Skip remote test for faster testing" );
   }

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,6 @@ class TestQgsGeoNodeConnection: public QObject`
`65`	`65`
`66`	`66`	`QString mKartozaGeoNodeGeoServerName;`
`67`	`67`	`QString mKartozaGeoNodeGeoServerURL;`
`68`		`-`
`69`		`- bool mSkipRemoteTest;`
`70`	`68`	`};`
`71`	`69`
`72`	`70`	`// Runs before all unit tests`
`@@ -82,9 +80,6 @@ void TestQgsGeoNodeConnection::initTestCase()`
`82`	`80`	`mKartozaGeoNodeGeoServerName = QStringLiteral( "Staging Kartoza GeoNode GeoServer" );`
`83`	`81`	`mKartozaGeoNodeGeoServerURL = QStringLiteral( "http://staginggs.geonode.kartoza.com" );`
`84`	`82`
`85`		`- // Change it to skip remote testing`
`86`		`- mSkipRemoteTest = true;`
`87`		`-`
`88`	`83`	`// Add Demo GeoNode Connection`
`89`	`84`	`QgsSettings settings;`
`90`	`85`
`@@ -99,7 +94,7 @@ void TestQgsGeoNodeConnection::initTestCase()`
`99`	`94`	`// Test the creation of geonode connection`
`100`	`95`	`void TestQgsGeoNodeConnection::testCreation()`
`101`	`96`	`{`
`102`		`- if ( mSkipRemoteTest )`
	`97`	`+ if ( QgsTest::isTravis() )`
`103`	`98`	`{`
`104`	`99`	`QSKIP( "Skip remote test for faster testing" );`
`105`	`100`	`}`
`@@ -128,7 +123,7 @@ void TestQgsGeoNodeConnection::testCreation()`
`128`	`123`	`// Test Layer API`
`129`	`124`	`void TestQgsGeoNodeConnection::testLayerAPI()`
`130`	`125`	`{`
`131`		`- if ( mSkipRemoteTest )`
	`126`	`+ if ( QgsTest::isTravis() )`
`132`	`127`	`{`
`133`	`128`	`QSKIP( "Skip remote test for faster testing" );`
`134`	`129`	`}`
`@@ -143,7 +138,7 @@ void TestQgsGeoNodeConnection::testLayerAPI()`
`143`	`138`	`// Test Style API`
`144`	`139`	`void TestQgsGeoNodeConnection::testStyleAPI()`
`145`	`140`	`{`
`146`		`- if ( mSkipRemoteTest )`
	`141`	`+ if ( QgsTest::isTravis() )`
`147`	`142`	`{`
`148`	`143`	`QSKIP( "Skip remote test for faster testing" );`
`149`	`144`	`}`