Browse Source

Test vsftpd and proftpd in parallel

Also use Ubuntu 14.04 instead of 12.04
Julian Kornberger 9 years ago
parent
commit
f109d22425
4 changed files with 34 additions and 7 deletions
  1. 7 7
      .travis.yml
  2. 18 0
      .travis/prepare.sh
  3. 9 0
      .travis/proftpd.conf
  4. 0 0
      .travis/vsftpd.conf

+ 7 - 7
.travis.yml

@@ -1,14 +1,14 @@
 language: go
+dist: trusty
+sudo: required
 go:
   - 1.7.3
+env:
+  - FTP_SERVER=vsftpd
+  - FTP_SERVER=proftpd
 before_install:
-- sudo mkdir --mode 0777 -p /var/ftp/incoming
-- sudo apt-get update -qq
-- sudo apt-get install -qq vsftpd
-- sudo cp $TRAVIS_BUILD_DIR/.vsftpd.conf /etc/vsftpd.conf
-- sudo service vsftpd restart
+- sudo $TRAVIS_BUILD_DIR/.travis/prepare.sh "$FTP_SERVER"
 - sudo sysctl net.ipv6.conf.lo.disable_ipv6=0
-- go get github.com/axw/gocov/gocov
 - go get github.com/mattn/goveralls
 script:
-- $GOPATH/bin/goveralls -service=travis-ci
+- goveralls -v

+ 18 - 0
.travis/prepare.sh

@@ -0,0 +1,18 @@
+#!/bin/sh -e
+
+case "$1" in
+  proftpd)
+    mkdir -p /etc/proftpd/conf.d/
+    cp $TRAVIS_BUILD_DIR/.travis/proftpd.conf /etc/proftpd/conf.d/
+    ;;
+  vsftpd)
+    cp $TRAVIS_BUILD_DIR/.travis/vsftpd.conf /etc/vsftpd.conf
+    ;;
+  *)
+    echo "unknown software: $1"
+    exit 1
+esac
+
+mkdir --mode 0777 -p /var/ftp/incoming
+
+apt-get install -qq "$1"

+ 9 - 0
.travis/proftpd.conf

@@ -0,0 +1,9 @@
+<Anonymous /var/ftp>
+  User        ftp
+  Group       nogroup
+  MaxClients  2
+  # We want clients to be able to login with "anonymous" as well as "ftp"
+  UserAlias   anonymous ftp
+
+  RequireValidShell  off
+</Anonymous>

+ 0 - 0
.vsftpd.conf → .travis/vsftpd.conf