add tests, remove duplicate license

2 files changed, 32 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29b73c409ff8..c054bc563964 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,13 @@
 pkgbase = nicotine-plus-git
 	pkgdesc = A graphical client for the SoulSeek peer-to-peer system
-	pkgver = 3.1.0.dev1.r5003.0998e180
+	pkgver = 3.1.2.dev1.r5463.5ce98e5f
 	pkgrel = 1
 	url = https://nicotine-plus.github.io/nicotine-plus
 	arch = any
 	license = GPL3
+	checkdepends = appstream-glib
+	checkdepends = desktop-file-utils
+	checkdepends = python-pytest-xvfb
 	makedepends = git
 	depends = python-gobject
 	depends = gtk3
diff --git a/PKGBUILD b/PKGBUILD
index f99a5ddd4889..12d971c16911 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Jorge Barroso <jorge.barroso.11 at gmail dot com>
 # Contributor: x-demon
 pkgname=nicotine-plus-git
-pkgver=3.1.0.dev1.r5003.0998e180
+pkgver=3.1.2.dev1.r5463.5ce98e5f
 pkgrel=1
 pkgdesc="A graphical client for the SoulSeek peer-to-peer system"
 arch=('any')
@@ -13,35 +13,46 @@ depends=('python-gobject' 'gtk3')
 makedepends=('git')
 optdepends=('gspell: for spell checking in chat'
             'libappindicator-gtk3: for tray icon')
-#checkdepends=('xorg-server-xvfb')
+checkdepends=('appstream-glib' 'desktop-file-utils' 'python-pytest-xvfb')
 provides=("${pkgname%-git}" 'nicotine+' 'nicotine')
 conflicts=("${pkgname%-git}" 'nicotine+' 'nicotine')
 source=('git+https://github.com/Nicotine-Plus/nicotine-plus.git')
 sha256sums=('SKIP')
 
 pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	printf "%s.r%s.%s" "$(python setup.py --version)" \
-		"$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$srcdir/${pkgname%-git}"
+  printf "%s.r%s.%s" "$(python setup.py --version)" \
+    "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 build() {
-	cd "$srcdir/${pkgname%-git}"
-	python setup.py build
+  cd "$srcdir/${pkgname%-git}"
+  python setup.py build
 }
 
-#check() {
-#	cd "$srcdir/${pkgname%-git}"
+check() {
+  cd "$srcdir/${pkgname%-git}"
+  _appdata_id=org.nicotine_plus.Nicotine
 
-	# Basic sanity check
-#	./nicotine --version | grep Nicotine+
+  # Some tests require an X server
+  display=":70"
+  Xvfb $display -screen 0 1024x768x24 -ac -noreset & xpid=$!
+  trap "kill -TERM $xpid || :" EXIT
+  sleep 3
+  export DISPLAY=$display
 
-	# Perform integration and unit tests
-#	xvfb-run python -m unittest
-#}
+  # Tests requiring an Internet connection are disabled
+  pytest --deselect=test/unit/test_version.py
+
+  desktop-file-validate data/$_appdata_id.desktop
+  appstream-util validate-relax --nonet data/$_appdata_id.metainfo.xml
+}
 
 package() {
-	cd "$srcdir/${pkgname%-git}"
-	export PYTHONHASHSEED=0
-	python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+  cd "$srcdir/${pkgname%-git}"
+  export PYTHONHASHSEED=0
+  python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+
+  # Remove duplicate GPL license
+  rm "$pkgdir/usr/share/doc/nicotine/COPYING"
 }