Use owncloudcmd in testVersionOfInstalledBinary
authorDominik Schmidt <dev@dominik-schmidt.de>
Mon, 14 Dec 2020 14:37:05 +0000 (15:37 +0100)
committerKevin Ottens <kevin.ottens@nextcloud.com>
Wed, 30 Dec 2020 15:17:47 +0000 (16:17 +0100)
... as it works without X in CI.

test/testutility.cpp

index aa21ed788519f367dd47b5f59c91c9a6c30ab55e..eed1c2b905eb9791b3a2c31b779173497d06e384 100644 (file)
@@ -8,6 +8,7 @@
 #include <QTemporaryDir>
 
 #include "common/utility.h"
+#include "config.h"
 
 using namespace OCC::Utility;
 
@@ -115,13 +116,11 @@ private slots:
     void testVersionOfInstalledBinary()
     {
         if (isLinux()) {
-            if (qgetenv("DISPLAY").isEmpty()) {
-                // Current requires an X-Server
-                return;
-            }
-            // pass the binary name owncloud to the next call. This brakes branding,
-            // but branding is not supposed to work with this.
-            QString ver = versionOfInstalledBinary(OWNCLOUD_BIN_PATH + QLatin1String("/nextcloud"));
+            // pass the cmd client from our build dir
+            // this is a bit inaccurate as it does not test the "real thing"
+            // but cmd and gui have the same --version handler by now
+            // and cmd works without X in CI
+            QString ver = versionOfInstalledBinary(QStringLiteral(OWNCLOUD_BIN_PATH  "/" APPLICATION_EXECUTABLE "cmd"));
             qDebug() << "Version of installed Nextcloud: " << ver;
             QVERIFY(!ver.isEmpty());