2
0
Эх сурвалжийг харах

tox: add a non-fuse env to the envlist

without this, openbsd and openindiana (which both skip all ".*fuse.*" envs) would not run any tests.

on platforms that have fuse, skip the "none" envs to not execute duplicate tests.
Thomas Waldmann 4 жил өмнө
parent
commit
6c4bf43817
2 өөрчлөгдсөн 4 нэмэгдсэн , 4 устгасан
  1. 3 3
      Vagrantfile
  2. 1 1
      tox.ini

+ 3 - 3
Vagrantfile

@@ -258,7 +258,7 @@ Vagrant.configure(2) do |config|
     b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant")
     b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("focal64")
     b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse")
-    b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("focal64", "^$")
+    b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("focal64", ".*none.*")
   end
 
   config.vm.define "bionic64" do |b|
@@ -286,7 +286,7 @@ Vagrant.configure(2) do |config|
     b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse")
     b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller()
     b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("buster64")
-    b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("buster64", "^$")
+    b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("buster64", ".*none.*")
   end
 
   config.vm.define "stretch64" do |b|
@@ -314,7 +314,7 @@ Vagrant.configure(2) do |config|
     b.vm.provision "packages arch", :type => :shell, :privileged => true, :inline => packages_arch
     b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_sys_venv("arch64")
     b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse")
-    b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("arch64", "^$")
+    b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("arch64", ".*none.*")
   end
 
   config.vm.define "freebsd64" do |b|

+ 1 - 1
tox.ini

@@ -2,7 +2,7 @@
 # fakeroot -u tox --recreate
 
 [tox]
-envlist = py{36,37,38,39}-fuse{2,3}
+envlist = py{36,37,38,39}-{none,fuse2,fuse3}
 
 [testenv]
 deps =