From a015330730756b510e30a8ef288c67306918238b Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Mon, 21 Mar 2022 17:34:26 +0100 Subject: [PATCH] Enable tmt CI tests, remove obsolete STI test --- .fmf/version | 1 + ci.fmf | 10 ++++++ tests/basic/Makefile | 63 ------------------------------------- tests/basic/PURPOSE | 3 -- tests/basic/runtest.sh | 57 --------------------------------- tests/basic/sqlite3-test.py | 37 ---------------------- tests/tests.yml | 16 ---------- 7 files changed, 11 insertions(+), 176 deletions(-) create mode 100644 .fmf/version create mode 100644 ci.fmf delete mode 100644 tests/basic/Makefile delete mode 100644 tests/basic/PURPOSE delete mode 100644 tests/basic/runtest.sh delete mode 100644 tests/basic/sqlite3-test.py delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..fac4c0a --- /dev/null +++ b/ci.fmf @@ -0,0 +1,10 @@ +/test: + summary: + Basic set of quick tests for sqlite. + discover: + - name: fedora + how: fmf + url: "https://src.fedoraproject.org/tests/sqlite.git" + ref: main + execute: + how: tmt diff --git a/tests/basic/Makefile b/tests/basic/Makefile deleted file mode 100644 index 6e4f8f5..0000000 --- a/tests/basic/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/sqlite3/Sanity/basic -# Description: Basic test for python and sqlite3 DB -# Author: Branislav Nater -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2013 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/sqlite3/Sanity/basic -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE sqlite3-test.py - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Branislav Nater " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Basic test for python and sqlite DB" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: sqlite3" >> $(METADATA) - @echo "Requires: python sqlite" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/basic/PURPOSE b/tests/basic/PURPOSE deleted file mode 100644 index e8394d1..0000000 --- a/tests/basic/PURPOSE +++ /dev/null @@ -1,3 +0,0 @@ -PURPOSE of /CoreOS/sqlite3/Sanity/basic -Description: Basic test for python and sqlite3 DB -Author: Branislav Nater diff --git a/tests/basic/runtest.sh b/tests/basic/runtest.sh deleted file mode 100644 index 7fc7d54..0000000 --- a/tests/basic/runtest.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/sqlite3/Sanity/basic -# Description: Basic test for python and sqlite3 DB -# Author: Branislav Nater -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2013 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include rhts environment -. /usr/bin/rhts-environment.sh -. /usr/lib/beakerlib/beakerlib.sh - -PACKAGES=${PACKAGES:-"python2 sqlite"} -REQUIRES=${REQUIRES:-sqlite} -PYTHON=${PYTHON:-python} - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm --all - rlAssertBinaryOrigin $PYTHON - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "cp sqlite3-test.py $TmpDir" 0 "Copy test script to $TmpDir" - rlRun "pushd $TmpDir" - rlPhaseEnd - - rlGetTestState && { - rlPhaseStartTest - rlRun "$PYTHON sqlite3-test.py" - rlPhaseEnd - } - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -r $TmpDir" 0 "Removing tmp directory" - rlPhaseEnd -rlJournalEnd -rlJournalPrintText diff --git a/tests/basic/sqlite3-test.py b/tests/basic/sqlite3-test.py deleted file mode 100644 index 505ffc8..0000000 --- a/tests/basic/sqlite3-test.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/python - -import sqlite3 -import sys - -conn = None - -try: - conn = sqlite3.connect('test.db') - - cur = conn.cursor() - - cur.execute('SELECT SQLITE_VERSION()') - ver = cur.fetchone() - print("SQLite version: %s" % ver) - - # Create a new table 'Writers' - cur.execute("CREATE TABLE Writers(Id INTEGER PRIMARY KEY AUTOINCREMENT, \ - Name VARCHAR(25))") - cur.execute("INSERT INTO Writers(Name) VALUES('Jack London')") - cur.execute("INSERT INTO Writers(Name) VALUES('Honore de Balzac')") - cur.execute("INSERT INTO Writers(Name) VALUES('Lion Feuchtwanger')") - - # Retrieve data - for row in cur.execute("SELECT * FROM Writers"): - print(row) - - cur.execute("DROP TABLE Writers") - -except (sqlite3.Error) as e: - print("Error %s:" % e.args[0]) - sys.exit(1) - -finally: - - if conn: - conn.close() diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index d6cfba6..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# Tests to run in a classic environment -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - tests: - - basic - required_packages: - - findutils # beakerlib needs find command - - which - - python2 - - sqlite -