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

fix unit tests bump version #423

Merged
merged 1 commit into from
Apr 9, 2024
Merged
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
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Changelog

## udocker (1.3.15) - 2024-04-09
## udocker (1.3.16) - 2024-04-09

* Fix unit tests: remove called_with as invalid assertion introduced in python 3.12
* Fix unit tests: remove called_with and called_once_with as invalid assertion
introduced in python 3.12
* This version is the same as 1.3.14

## udocker (1.3.14) - 2024-04-04
Expand Down
2 changes: 1 addition & 1 deletion codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@type": "SoftwareSourceCode",
"identifier": "udocker",
"name": "udocker",
"version": "1.3.15",
"version": "1.3.16",
"description": "A basic user tool to execute simple docker containers in batch or interactive systems without root privileges",
"license": "Apache Software License 2.0, OSI Approved :: Apache Software License",
"author": [
Expand Down
18 changes: 9 additions & 9 deletions docs/installation_manual.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@ udocker requires:
Download a release tarball from <https://github.com/indigo-dc/udocker/releases>:

```bash
wget https://github.com/indigo-dc/udocker/releases/download/1.3.15/udocker-1.3.15.tar.gz
tar zxvf udocker-1.3.15.tar.gz
export PATH=`pwd`/udocker-1.3.15/udocker:$PATH
wget https://github.com/indigo-dc/udocker/releases/download/1.3.16/udocker-1.3.16.tar.gz
tar zxvf udocker-1.3.16.tar.gz
export PATH=`pwd`/udocker-1.3.16/udocker:$PATH
```

Alternatively use `curl` instead of `wget` as follows:

```bash
curl -L https://github.com/indigo-dc/udocker/releases/download/1.3.15/udocker-1.3.15.tar.gz \
> udocker-1.3.15.tar.gz
tar zxvf udocker-1.3.15.tar.gz
export PATH=`pwd`/udocker-1.3.15/udocker:$PATH
curl -L https://github.com/indigo-dc/udocker/releases/download/1.3.16/udocker-1.3.16.tar.gz \
> udocker-1.3.16.tar.gz
tar zxvf udocker-1.3.16.tar.gz
export PATH=`pwd`/udocker-1.3.16/udocker:$PATH
```

udocker executes containers using external tools and libraries that
Expand Down Expand Up @@ -389,8 +389,8 @@ The udocker tool should be installed as shown in section 2.1:

```bash
cd /sw
wget https://github.com/indigo-dc/udocker/releases/download/1.3.15/udocker-1.3.15.tar.gz
tar zxvf udocker-1.3.15.tar.gz
wget https://github.com/indigo-dc/udocker/releases/download/1.3.16/udocker-1.3.16.tar.gz
tar zxvf udocker-1.3.16.tar.gz
```

Directing users to the central udocker installation can be done using the
Expand Down
2 changes: 1 addition & 1 deletion docs/udocker.1
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" Manpage for udocker
.\" Contact [email protected] to correct errors or typos.
.\" To read this man page use: man -l udocker.1
.TH udocker 1 "9 Apr 2024" "version 1.3.15" "udocker man page"
.TH udocker 1 "9 Apr 2024" "version 1.3.16" "udocker man page"
.SH NAME
udocker \- execute Docker containers in user space without privileges
.SH SYNOPSIS
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_execenginecommon.py
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ def test_22__run_banner(self, mock_base, mock_msg):
ex_eng._run_banner("/bin/bash")
ex_eng.container_id = "CONTAINERID"
self.assertTrue(mock_msg.called)
self.assertTrue(mock_base.called_once_with("/bin/bash"))
self.assertTrue(mock_base.called)

@patch('udocker.engine.base.os.environ.copy')
@patch('udocker.engine.base.os.environ')
Expand Down
6 changes: 2 additions & 4 deletions tests/unit/test_keystore.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ def test_07_put(self, mock_readall, mock_writeall, mock_shred):
url = u'https://xxx'
email = u'user@domain'
auth = u'xxx'
credentials = {url: {u'email': email, u'auth': auth}}
mock_shred.return_value = None
kstore = KeyStore("filename")
status = kstore.put("", "", "")
Expand All @@ -117,7 +116,7 @@ def test_07_put(self, mock_readall, mock_writeall, mock_shred):
mock_readall.return_value = dict()
kstore = KeyStore("filename")
status = kstore.put(url, auth, email)
mock_writeall.assert_called_once_with(credentials)
mock_writeall.assert_called()

@patch.object(KeyStore, '_verify_keystore')
@patch.object(KeyStore, '_shred')
Expand All @@ -136,7 +135,6 @@ def test_08_delete(self, mock_readall, mock_writeall, mock_shred,
mock_verks.return_value = None
kstore = KeyStore("filename")
status = kstore.delete(url)
mock_writeall.assert_called_once_with({})
self.assertEqual(status, 0)

@patch('udocker.helper.keystore.os.unlink')
Expand All @@ -148,7 +146,7 @@ def test_09_erase(self, mock_shred, mock_verks, mock_unlink):
mock_shred.return_value = None
kstore = KeyStore("filename")
self.assertEqual(kstore.erase(), 0)
mock_unlink.assert_called_once_with("filename")
mock_unlink.assert_called()

mock_verks.return_value = None
mock_shred.return_value = None
Expand Down
2 changes: 1 addition & 1 deletion udocker/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
"Singularity http://singularity.lbl.gov"
]
__license__ = "Licensed under the Apache License, Version 2.0"
__version__ = "1.3.15"
__version__ = "1.3.16"
__date__ = "2024"