Merge pull request #173 from pytest-dev/ronny/fix-vagrant-test

fix vagrant tests

Author: RonnyPfannschmidt

.gitignore

@@ -16,3 +16,8 @@ bin/
 include/
 .Python
 .env/
+.cache/
+.vagrant/
+.vagrant.d/
+.config/
+.local/

Vagrantfile

@@ -0,0 +1,70 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# All Vagrant configuration is done below. The "2" in Vagrant.configure
+# configures the configuration version (we support older styles for
+# backwards compatibility). Please don't change it unless you know what
+# you're doing.
+Vagrant.configure("2") do |config|
+  # The most common configuration options are documented and commented below.
+  # For a complete reference, please see the online documentation at
+  # https://docs.vagrantup.com.
+
+  # Every Vagrant development environment requires a box. You can search for
+  # boxes at https://vagrantcloud.com/search.
+  config.vm.box = "generic/debian11"
+
+  # Disable automatic box update checking. If you disable this, then
+  # boxes will only be checked for updates when the user runs
+  # `vagrant box outdated`. This is not recommended.
+  # config.vm.box_check_update = false
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine. In the example below,
+  # accessing "localhost:8080" will access port 80 on the guest machine.
+  # NOTE: This will enable public access to the opened port
+  # config.vm.network "forwarded_port", guest: 80, host: 8080
+
+  # Create a forwarded port mapping which allows access to a specific port
+  # within the machine from a port on the host machine and only allow access
+  # via 127.0.0.1 to disable public access
+  # config.vm.network "forwarded_port", guest: 80, host: 8080, host_ip: "127.0.0.1"
+
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  # config.vm.network "private_network", ip: "192.168.33.10"
+
+  # Create a public network, which generally matched to bridged network.
+  # Bridged networks make the machine appear as another physical device on
+  # your network.
+  # config.vm.network "public_network"
+
+  # Share an additional folder to the guest VM. The first argument is
+  # the path on the host to the actual folder. The second argument is
+  # the path on the guest to mount the folder. And the optional third
+  # argument is a set of non-required options.
+  # config.vm.synced_folder "../data", "/vagrant_data"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  # config.vm.provider "virtualbox" do |vb|
+  #   # Display the VirtualBox GUI when booting the machine
+  #   vb.gui = true
+  #
+  #   # Customize the amount of memory on the VM:
+  #   vb.memory = "1024"
+  # end
+  #
+  # View the documentation for the provider you are using for more
+  # information on available options.
+
+  # Enable provisioning with a shell script. Additional provisioners such as
+  # Ansible, Chef, Docker, Puppet and Salt are also available. Please see the
+  # documentation for more information about their specific syntax and use.
+  # config.vm.provision "shell", inline: <<-SHELL
+  #   apt-get update
+  #   apt-get install -y apache2
+  # SHELL
+end

testing/test_xspec.py

@@ -1,4 +1,7 @@
+from __future__ import annotations
+
 import os
+import shutil
 import subprocess
 import sys
 
@@ -21,10 +24,10 @@
 class TestXSpec:
     def test_norm_attributes(self):
         spec = XSpec(
-            r"socket=192.168.102.2:8888//python=c:/this/python2.5" r"//chdir=d:\hello"
+            r"socket=192.168.102.2:8888//python=c:/this/python3.8//chdir=d:\hello"
         )
         assert spec.socket == "192.168.102.2:8888"
-        assert spec.python == "c:/this/python2.5"
+        assert spec.python == "c:/this/python3.8"
         assert spec.chdir == r"d:\hello"
         assert spec.nice is None
         assert not hasattr(spec, "_xyz")
@@ -195,19 +198,28 @@ def test_ssh(self, specssh, makegateway):
         assert rinfo.cwd == rinfo2.cwd
         assert rinfo.version_info == rinfo2.version_info
 
-    @pytest.mark.xfail(reason="bad image name", run=False)
-    def test_vagrant(self, makegateway, tmpdir, monkeypatch):
-        vagrant = py.path.local.sysfind("vagrant")
-        if vagrant is None:
+    def test_vagrant(self, makegateway):
+        vagrant_bin = shutil.which("vagrant")
+        if vagrant_bin is None:
             pytest.skip("Vagrant binary not in PATH")
-        monkeypatch.chdir(tmpdir)
-        subprocess.check_call("vagrant init hashicorp/precise32", shell=True)
-        subprocess.check_call("vagrant up --provider virtualbox", shell=True)
-        gw = makegateway("vagrant_ssh=default")
+        res = subprocess.run(
+            [vagrant_bin, "status", "default", "--machine-readable"],
+            capture_output=True,
+            encoding="utf-8",
+            errors="replace",
+        ).stdout
+        print(res)
+        if ",default,state,shutoff\n" in res:
+            pytest.xfail("vm shutoff, run `vagrant up` first")
+        if ",default,state,not_created\n" in res:
+            pytest.xfail("vm not created, run `vagrant up` first")
+        if ",default,state,running\n" not in res:
+            pytest.fail("unknown vm state")
+
+        gw = makegateway("vagrant_ssh=default//python=python3")
         rinfo = gw._rinfo()
         rinfo.cwd == "/home/vagrant"
         rinfo.executable == "/usr/bin/python"
-        subprocess.check_call("vagrant halt", shell=True)
 
     def test_socket(self, specsocket, makegateway):
         gw = makegateway("socket=%s//id=sock1" % specsocket.socket)