Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing tests and remove python36 tests. #20

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ jobs:
fail-fast: false
matrix:
include:
# note: actions/setup-ruby only allows using a major.minor release of ruby
# note: ruby/setup-ruby only allows using a major.minor release of ruby
- ruby: '2.7'
puppet: "7.0"
check: "check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
name: 'static'
- ruby: '2.5'
puppet: "6.0"
check: "parallel_spec"
name: 'spec'
# - ruby: '2.7'
# puppet: "6.0"
# check: "parallel_spec"
# name: 'spec'
- ruby: '2.7'
puppet: "7.0"
check: "parallel_spec"
Expand All @@ -44,7 +44,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup Ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: '${{ matrix.ruby }}'
- name: Bundle prep
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v2
- name: Setup Ruby
uses: actions/setup-ruby@v1
uses: ruby/setup-ruby@v1
with:
ruby-version: '${{ matrix.ruby }}'
- name: Bundle prep
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
THIS_FILE := $(lastword $(MAKEFILE_LIST))
ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
CI_REPO_PATH ?= $(ROOT_DIR)/ci
CI_REPO_BRANCH ?= master
CI_REPO_BRANCH ?= hotfix/code-coverage

.PHONY: all
all: .DEFAULT
Expand Down
2 changes: 1 addition & 1 deletion build/centos7-puppet6/Dockerfile.kitchen
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN chmod 0600 /home/<%= @username %>/.ssh/authorized_keys
RUN echo '<%= IO.read(@public_key).strip %>' >> /home/<%= @username %>/.ssh/authorized_keys

# upgrade the image, otherwise installing st2 package hangs
RUN yum -y upgrade
RUN yum -y upgrade --exclude=openssh*

# install doc files (/usr/share/docs) when installing yum packages
# otherwise /usr/share/docs/st2/conf/nginx/st2.conf won't be present
Expand Down
2 changes: 1 addition & 1 deletion manifests/profile/redis.pp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

class { 'redis':
bind => $bind_ip,
manage_repo => $redis_manage_repo
manage_repo => $redis_manage_repo,
}

contain redis
Expand Down
10 changes: 0 additions & 10 deletions manifests/test/fullinstall_python36.pp

This file was deleted.

15 changes: 15 additions & 0 deletions test/unit/test_tasks_key_decrypt.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from test.unit.st2_test_case import St2TestCase
# import mock
import os
import sys
from key_decrypt import AESKey

sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'tasks'))


class AESKeyTestCase(St2TestCase):
__test__ = True

def test_init(self):
task = AESKey('test', 'test', 256)
self.assertIsInstance(task, object)