From 1815ad27684435a0612c987b5d6d8893417593f8 Mon Sep 17 00:00:00 2001
From: Prashanth Pai <ppai@redhat.com>
Date: Thu, 10 Mar 2016 11:38:07 +0530
Subject: Fix and simplify tox.ini

* Remove deprecated tox options
* Simplify tox.ini
* Update .gitignore
* Update test-requirements.txt
* Fix pep8 issues

All tests now run on centos7 without any modifications.
Code coverage output is now displayed properly for both unit test
and functional test runs.

Change-Id: I877cc0ad2c560579c12d528af3ac9bf5eea28378
Signed-off-by: Prashanth Pai <ppai@redhat.com>
---
 functional_tests.sh | 46 ----------------------------------------------
 1 file changed, 46 deletions(-)
 delete mode 100755 functional_tests.sh

(limited to 'functional_tests.sh')

diff --git a/functional_tests.sh b/functional_tests.sh
deleted file mode 100755
index 32fcbe6..0000000
--- a/functional_tests.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2014 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This program expects to be run by tox in a virtual python environment
-# so that it does not pollute the host development system
-
-cleanup()
-{
-    if [ -d "/export/brick/b1/" ]; then
-        sudo rm -rf /export/brick/b1/* > /dev/null 2>&1
-    fi
-}
-
-fail()
-{
-    cleanup
-    echo "$1"
-    exit 1
-}
-
-### MAIN ###
-
-mkdir functional_tests > /dev/null 2>&1
-nosetests -v --exe \
-          --with-xunit \
-          --xunit-file functional_tests/libgfapi-python.xml \
-          --with-html-output \
-          --html-out-file functional_tests/libgfapi-python-result.html \
-          test/functional || fail "Functional tests failed"
-
-cleanup
-exit 0
-- 
cgit