Merge pull request #4 from gopasspw/fix/disp

[fix] Attempt to fix tests that need display on linux

Author: dominikschulz

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
     - name: Harden Runner
       uses: step-security/harden-runner@c6295a65d1254861815972266d5933fd6e532bdf # v2.11.1
       with:
-        egress-policy: block
+        egress-policy: audit
         allowed-endpoints: >
           github.com:443
           objects.githubusercontent.com:443
@@ -51,7 +51,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-go-
     - name: Ubuntu Dependencies
-      run: sudo apt-get install --yes wl-clipboard xclip xsel
+      run: sudo apt-get install --yes wl-clipboard xclip xsel xvfb x11-xserver-utils
 
     -
       name: Debug
@@ -62,10 +62,23 @@ jobs:
         echo ${GITHUB_WORKSPACE}
         echo ${GOPATH}
         echo ${GOROOT}
-        env  
+        echo ${DISPLAY}
+        env
 
     - name: Build and Unit Test
-      run: go test ./...
+      run: xvfb-run --auto-servernum go test ./...
+
+    - name: cleanup xvfb
+      run: |
+        xvfb_pids=`ps aux | grep tmp/xvfb-run | grep -v grep | awk '{print $2}'`
+        if [ "$xvfb_pids" != "" ]; then
+          echo "Killing the following xvfb processes: $xvfb_pids"
+          sudo kill $xvfb_pids
+        else
+          echo "No xvfb processes to kill"
+        fi
+      env:
+        CI: true
 
   windows:
     runs-on: windows-latest

clipboard_test.go

@@ -5,18 +5,12 @@
 package clipboard_test
 
 import (
-	"os"
-	"runtime"
 	"testing"
 
 	. "github.com/gopasspw/clipboard"
 )
 
 func TestCopyAndPaste(t *testing.T) {
-	if runtime.GOOS == "linux" && os.Getenv("WAYLAND_DISPLAY") == "" && os.Getenv("DISPLAY") == "" {
-		t.Skip("Skipping test on Linux without Wayland or X11")
-	}
-
 	expected := "日本語"
 
 	err := WriteAllString(t.Context(), expected)
@@ -35,10 +29,6 @@ func TestCopyAndPaste(t *testing.T) {
 }
 
 func TestMultiCopyAndPaste(t *testing.T) {
-	if runtime.GOOS == "linux" && os.Getenv("WAYLAND_DISPLAY") == "" && os.Getenv("DISPLAY") == "" {
-		t.Skip("Skipping test on Linux without Wayland or X11")
-	}
-
 	expected1 := "French: éèêëàùœç"
 	expected2 := "Weird UTF-8: 💩☃"
 

clipboard_unix.go

@@ -158,6 +158,7 @@ func readAll(ctx context.Context) ([]byte, error) {
 	if w.trimDOS && len(result) > 1 {
 		result = result[:len(result)-2]
 	}
+
 	return result, nil
 }
 
@@ -190,6 +191,7 @@ func writeAll(ctx context.Context, text []byte, secret bool) error {
 	if err := copyCmd.Wait(); err != nil {
 		return fmt.Errorf("failed to wait for command: %w", err)
 	}
+
 	return nil
 }
 

example_test.go

@@ -1,17 +1,15 @@
-//go:build interactive
-// +build interactive
-
 package clipboard_test
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/gopasspw/clipboard"
 )
 
 func Example() {
-	clipboard.WriteAllString("日本語")      //nolint:errcheck
-	text, _ := clipboard.ReadAllString() //nolint:errcheck
+	clipboard.WriteAllString(context.TODO(), "日本語")    //nolint:errcheck
+	text, _ := clipboard.ReadAllString(context.TODO()) //nolint:errcheck
 	fmt.Println(text)
 
 	// Output: