test Xtightvnc (#87)

.github/workflows/main.yml

@@ -46,7 +46,7 @@ jobs:
  if: startsWith(matrix.os, 'ubuntu')
  run: |
  sudo apt-get update
- sudo apt-get install -y tigervnc-standalone-server xserver-xephyr gnumeric x11-utils
+ sudo apt-get install -y tigervnc-standalone-server tightvncserver xserver-xephyr gnumeric x11-utils
  - name: Install MacOS dependencies
  if: startsWith(matrix.os, 'macos')
  run: |

tests/test_xvnc.py

@@ -1,47 +1,66 @@
 import tempfile
 from pathlib import Path
 
-from tutil import has_xvnc, rfbport, worker
+from tutil import has_xvnc, has_xtightvnc, has_xtigervnc, rfbport, worker
 from vncdotool import api
 
 from pyvirtualdisplay import Display
 from pyvirtualdisplay.xvnc import XvncDisplay
+from pyvirtualdisplay import xvnc
 
 if has_xvnc():
 
  def test_xvnc():
- with tempfile.TemporaryDirectory() as temp_dir:
- vnc_png = Path(temp_dir) / "vnc.png"
- password = "123456"
- passwd_file = Path(temp_dir) / "pwd.txt"
- vncpasswd_generated = b"\x49\x40\x15\xf9\xa3\x5e\x8b\x22"
- passwd_file.write_bytes(vncpasswd_generated)
-
- if worker() == 0:
- with Display(backend="xvnc"):
- with api.connect("localhost:0") as client:
- client.timeout = 1
- client.captureScreen(vnc_png)
- with XvncDisplay():
- with api.connect("localhost:0") as client:
- client.timeout = 1
- client.captureScreen(vnc_png)
-
- sconnect = "localhost:%s" % (rfbport() - 5900)
- with Display(backend="xvnc", rfbport=rfbport()):
- with api.connect(sconnect) as client:
- client.timeout = 1
- client.captureScreen(vnc_png)
- with XvncDisplay(rfbport=rfbport()):
- with api.connect(sconnect) as client:
- client.timeout = 1
- client.captureScreen(vnc_png)
+ check_xvnc()
+
+
+if has_xtightvnc():
+
+ def test_xvnc_tight():
+ xvnc.PROGRAM = "Xtightvnc"
+ check_xvnc()
 
- with Display(backend="xvnc", rfbport=rfbport(), rfbauth=passwd_file):
- with api.connect(sconnect, password=password) as client:
+
+if has_xtigervnc():
+
+ def test_xvnc_tiger():
+ xvnc.PROGRAM = "Xtigervnc"
+ check_xvnc()
+
+
+def check_xvnc():
+ with tempfile.TemporaryDirectory() as temp_dir:
+ vnc_png = Path(temp_dir) / "vnc.png"
+ password = "123456"
+ passwd_file = Path(temp_dir) / "pwd.txt"
+ vncpasswd_generated = b"\x49\x40\x15\xf9\xa3\x5e\x8b\x22"
+ passwd_file.write_bytes(vncpasswd_generated)
+
+ if worker() == 0:
+ with Display(backend="xvnc"):
+ with api.connect("localhost:0") as client:
  client.timeout = 1
  client.captureScreen(vnc_png)
- with XvncDisplay(rfbport=rfbport(), rfbauth=passwd_file):
- with api.connect(sconnect, password=password) as client:
+ with XvncDisplay():
+ with api.connect("localhost:0") as client:
  client.timeout = 1
  client.captureScreen(vnc_png)
+
+ sconnect = "localhost:%s" % (rfbport() - 5900)
+ with Display(backend="xvnc", rfbport=rfbport()):
+ with api.connect(sconnect) as client:
+ client.timeout = 1
+ client.captureScreen(vnc_png)
+ with XvncDisplay(rfbport=rfbport()):
+ with api.connect(sconnect) as client:
+ client.timeout = 1
+ client.captureScreen(vnc_png)
+
+ with Display(backend="xvnc", rfbport=rfbport(), rfbauth=passwd_file):
+ with api.connect(sconnect, password=password) as client:
+ client.timeout = 1
+ client.captureScreen(vnc_png)
+ with XvncDisplay(rfbport=rfbport(), rfbauth=passwd_file):
+ with api.connect(sconnect, password=password) as client:
+ client.timeout = 1
+ client.captureScreen(vnc_png)

tests/tutil.py

@@ -31,6 +31,12 @@ def has_displayfd():
 def has_xvnc():
  return prog_check(["Xvnc", "-help"])
 
+def has_xtightvnc():
+ return prog_check(["Xtightvnc", "-version"])
+
+def has_xtigervnc():
+ return prog_check(["Xtigervnc", "-help"])
+
 
 def worker():
  w = 0

tests/vagrant/debian10.sh

@@ -22,7 +22,7 @@ sudo apt-get install -y mc python3-pip xvfb
 # sudo apt-get install -y libjpeg-dev zlib1g-dev
 
 # project dependencies
-sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server
+sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server tightvncserver
 
 # test dependencies
 sudo apt-get install -y gnumeric

tests/vagrant/debian11.sh

@@ -22,7 +22,7 @@ sudo apt-get install -y mc python3-pip xvfb
 # sudo apt-get install -y libjpeg-dev zlib1g-dev
 
 # project dependencies
-sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server
+sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server tightvncserver
 
 # test dependencies
 sudo apt-get install -y gnumeric

tests/vagrant/ubuntu1804.sh

@@ -14,7 +14,7 @@ sudo apt-get install -y mc python3-pip xvfb
 # sudo apt-get install -y libjpeg-dev zlib1g-dev
 
 # project dependencies
-sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server
+sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server tightvncserver
 
 # test dependencies
 sudo apt-get install -y gnumeric

tests/vagrant/ubuntu2004.sh

@@ -14,7 +14,7 @@ sudo apt-get install -y mc python3-pip xvfb
 # sudo apt-get install -y libjpeg-dev zlib1g-dev
 
 # project dependencies
-sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server
+sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server tightvncserver
 
 # test dependencies
 sudo apt-get install -y gnumeric

tests/vagrant/ubuntu2204.sh

@@ -29,7 +29,7 @@ sudo apt-get install -y mc python3-pip xvfb
 # sudo apt-get install -y libjpeg-dev zlib1g-dev
 
 # project dependencies
-sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server
+sudo apt-get install -y xvfb xserver-xephyr tigervnc-standalone-server tightvncserver
 
 # test dependencies
 sudo apt-get install -y gnumeric