Hello community, here is the log from the commit of package vagrant-sshfs for openSUSE:Factory checked in at 2020-04-01 22:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vagrant-sshfs (Old) and /work/SRC/openSUSE:Factory/.vagrant-sshfs.new.3248 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vagrant-sshfs" Wed Apr 1 22:56:42 2020 rev:8 rq:790711 version:1.3.4 Changes: -------- --- /work/SRC/openSUSE:Factory/vagrant-sshfs/vagrant-sshfs.changes 2020-03-31 17:16:09.735662539 +0200 +++ /work/SRC/openSUSE:Factory/.vagrant-sshfs.new.3248/vagrant-sshfs.changes 2020-04-01 22:56:43.596566432 +0200 @@ -1,0 +2,17 @@ +Wed Apr 1 20:38:10 UTC 2020 - Dan Čermák <[email protected]> + +- Fix test suite failures (boo#1168371) + + The testsuite was implicitly assuming that /sbin/ is a symlink to /usr/sbin + (which is the case on Fedora, but not on opensuse). By switching to the + /var/run -> /run symlink, we fix this issue. + + Also, the sed call in the spec file to change the Fedora box to + opensuse/Tumbleweed.$(uname -m) got removed and instead was moved into the + packaged Vagrantfile. + + Added patches: + * 0001-Use-var-run-run-symlink-for-tests.patch + * 0002-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch + +------------------------------------------------------------------- New: ---- 0001-Use-var-run-run-symlink-for-tests.patch 0002-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vagrant-sshfs.spec ++++++ --- /var/tmp/diff_new_pack.higzHw/_old 2020-04-01 22:56:47.136567591 +0200 +++ /var/tmp/diff_new_pack.higzHw/_new 2020-04-01 22:56:47.140567593 +0200 @@ -34,6 +34,10 @@ Source2: https://keybase.io/dustymabe/pgp_keys.asc#/%{name}.keyring # custom script to automate the test suite run Source3: testsuite.sh +# https://github.com/dustymabe/vagrant-sshfs/pull/109 +Patch0: 0001-Use-var-run-run-symlink-for-tests.patch +# FIX-OPENSUSE use the Tumbleweed.$(uname -m) vagrant box instead of fedora/*-cloud-base +Patch1: 0002-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch BuildRequires: %{ruby} BuildRequires: ruby-macros >= 5 BuildRequires: vagrant >= 1.9.1 @@ -66,7 +70,7 @@ vagrant-sshfs. %prep -%autosetup -c +%autosetup -c -p1 # since we don't have the full git repo we can't use `git ls-files` sed -i 's/git ls-files -z/find . -type f -print0/' %{vagrant_plugin_name}.gemspec @@ -83,7 +87,6 @@ %install %vagrant_plugin_install -n %{mod_full_name}.gem install -p -m 0755 %{SOURCE3} %{buildroot}/%{vagrant_plugin_instdir}/test/misc/ -sed -i "s#box = '.*/.*'#box = 'opensuse/Tumbleweed.$(uname -m)'#" %{buildroot}/%{vagrant_plugin_instdir}/test/misc/Vagrantfile %files %{vagrant_plugin_instdir} ++++++ 0001-Use-var-run-run-symlink-for-tests.patch ++++++ >From 99a62bb2bc01f042987a17e414a702ad2291ab26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Wed, 1 Apr 2020 22:28:22 +0200 Subject: [PATCH 1/2] Use /var/run/ -> /run symlink for tests The symlink /var/run -> /run is more common among different Linux distributions than /sbin/ -> /usr/sbin. This makes the testsuite a bit more portable when swapping the vagrant box for one of a different distro. --- test/misc/Vagrantfile | 2 +- test/misc/dotests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/misc/Vagrantfile b/test/misc/Vagrantfile index e15376d..b975ffa 100644 --- a/test/misc/Vagrantfile +++ b/test/misc/Vagrantfile @@ -8,7 +8,7 @@ Vagrant.configure(2) do |config| # Test a forward mount to a location that is a symbolic link # https://github.com/dustymabe/vagrant-sshfs/issues/44 - config.vm.synced_folder "/etc/", "/sbin/forward_slave_mount_sym_link_test/", type: "sshfs" + config.vm.synced_folder "/etc/", "/var/run/forward_slave_mount_sym_link_test/", type: "sshfs" # Test a forward normal mount: # mounting a folder from a 3rd party host into guest diff --git a/test/misc/dotests.sh b/test/misc/dotests.sh index e133e8e..e80b4c9 100644 --- a/test/misc/dotests.sh +++ b/test/misc/dotests.sh @@ -8,7 +8,7 @@ vagrant ssh -- cat /tmp/forward_slave_mount_etc/machine-id # https://github.com/dustymabe/vagrant-sshfs/issues/44 echo -en "Testing slave forward mount with a symlink!\n\t" -vagrant ssh -- cat /usr/sbin/forward_slave_mount_sym_link_test/machine-id +vagrant ssh -- cat /run/forward_slave_mount_sym_link_test/machine-id echo -en "Testing normal forward mount!\n\t" vagrant ssh -- cat /tmp/forward_normal_mount_etc/machine-id -- 2.26.0 ++++++ 0002-Use-opensuse-Tumbleweed.-uname-m-box-instead-of-Fedo.patch ++++++ >From 56f320784d5439fa30104c9b62e63135e693505f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= <[email protected]> Date: Wed, 1 Apr 2020 22:34:10 +0200 Subject: [PATCH 2/2] Use opensuse/Tumbleweed.$(uname -m) box instead of Fedora/31 --- test/misc/Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/misc/Vagrantfile b/test/misc/Vagrantfile index b975ffa..9874f79 100644 --- a/test/misc/Vagrantfile +++ b/test/misc/Vagrantfile @@ -22,7 +22,7 @@ Vagrant.configure(2) do |config| config.vm.synced_folder "/tmp/reverse_mount_etc/", "/etc", type: "sshfs", reverse: true host = 'sshfs-tests' - box = 'fedora/31-cloud-base' + box = "opensuse/Tumbleweed.#{(RUBY_PLATFORM.split '-')[0]}" config.vm.define host do | tmp | tmp.vm.hostname = host -- 2.26.0 ++++++ testsuite.sh ++++++ --- /var/tmp/diff_new_pack.higzHw/_old 2020-04-01 22:56:47.192567610 +0200 +++ /var/tmp/diff_new_pack.higzHw/_new 2020-04-01 22:56:47.192567610 +0200 @@ -36,7 +36,7 @@ # extracted from dotests.sh: SLAVE_FORWARD_MACHINE_ID=$(vagrant ssh -- cat /tmp/forward_slave_mount_etc/machine-id) -SLAVE_FORWARD_SYMLINK_MACHINE_ID=$(vagrant ssh -- cat /usr/sbin/forward_slave_mount_sym_link_test/machine-id) +SLAVE_FORWARD_SYMLINK_MACHINE_ID=$(vagrant ssh -- cat /run/forward_slave_mount_sym_link_test/machine-id) FORWARD_MACHINE_ID=$(vagrant ssh -- cat /tmp/forward_normal_mount_etc/machine-id)
