Skip to content
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
20 changes: 10 additions & 10 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
max-parallel: 1
matrix:
python-version: ["3.8", "3.9", "3.11"]
python-version: ["3.9", "3.11"]
env:
PYSNC_SERVER: ${{ secrets.PYSNC_SERVER }}
PYSNC_USERNAME: ${{ secrets.PYSNC_USERNAME }}
Expand All @@ -21,20 +21,20 @@ jobs:
PYSNC_CLIENT_SECRET: ${{ secrets.PYSNC_CLIENT_SECRET }}
steps:
- name: check out repository
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: set up python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: setup poetry
uses: snok/install-poetry@v1
with:
poetry-version: 1.4.2
poetry-version: 2.1.3
virtualenvs-create: true
virtualenvs-in-project: true
- name: cache deps
id: cache-deps
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: .venv
key: pydeps-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
Expand All @@ -58,20 +58,20 @@ jobs:
if: github.ref == 'refs/heads/main'
needs: install-test
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: cache poetry install
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.local
key: poetry-1.4.2-0
key: poetry-2.1.3-0
- name: setup poetry
uses: snok/install-poetry@v1
with:
poetry-version: 1.4.2
poetry-version: 2.1.3
virtualenvs-create: true
virtualenvs-in-project: true
- name: cache deps
Expand Down
844 changes: 465 additions & 379 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ classifiers = [
]

[tool.poetry.dependencies]
python = "^3.8"
requests = "^2.31.0"
python = "^3.9"
requests = ">=2.32"
requests-oauthlib = { version = ">=1.2.0", optional = true}
certifi = "^2024.7.4"
urllib3 = "^2.0.7"
urllib3 = ">=2.5"

[tool.poetry.extras]
oauth = ["requests-oauthlib"]
Expand Down
4 changes: 2 additions & 2 deletions pysnc/record.py
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,7 @@ def get_element(self, field) -> GlideElement:
c = self._current()
if c is None:
raise NoRecordException('cannot get a value from nothing, did you forget to call next() or initialize()?')
return self._current()[field] if field in c else None
return self._current()[field] if field in c else None # type: ignore

def set_value(self, field, value):
"""
Expand Down Expand Up @@ -831,7 +831,7 @@ def set_link(self, field, value):

def get_link(self, no_stack: bool=False) -> str:
"""
Generate a full URL to the current record. sys_id will be -1 if there is no current record.
Generate a full URL to the current record. sys_id will be -1 i*f there is no current record.

:param bool no_stack: Default ``False``, adds ``&sysparm_stack=<table>_list.do?sysparm_query=active=true`` to the URL
:param bool list: Default ``False``, if ``True`` then provide a link to the record set, not the current record
Expand Down
2 changes: 1 addition & 1 deletion test/test_snc_api_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def test_nonjson_error(self):

super_long_non_existant_name = "A" * 23000
gr = client.GlideRecord(super_long_non_existant_name)
self.assertRaisesRegex(exceptions.RequestException, r'^<!DOCTYPE html>.*', lambda: gr.get('doesntmatter'))
self.assertRaisesRegex(exceptions.RequestException, r'^<.*html>.*', lambda: gr.get('doesntmatter'))

def test_changes(self):
client = ServiceNowClient(self.c.server, self.c.credentials)
Expand Down
30 changes: 10 additions & 20 deletions test/test_snc_api_query_advanced.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,29 +31,19 @@ def test_join_query_2(self):
def test_rl_query_manual(self):
# simulate a left outter join by finding users with no roles
client = ServiceNowClient(self.c.server, self.c.credentials)
gr = client.GlideRecord('sys_user')
gr.add_encoded_query('RLQUERYsys_user_has_role.user,=0^ENDRLQUERY')
gr = client.GlideRecord('sys_user_group')
gr.add_encoded_query('RLQUERYsys_group_has_role.group,>0,m2m^role.nameLIKEadmin^ENDRLQUERY')
gr.query()
self.assertGreater(gr.get_row_count(), 1)
self.assertLess(gr.get_row_count(), 10)

def test_rl_query_basic(self):
# simulate a left outter join by finding users with no roles
client = ServiceNowClient(self.c.server, self.c.credentials)
gr = client.GlideRecord('sys_user')
gr.add_rl_query('sys_user_has_role', 'user', '=0')
self.assertEqual(gr.get_encoded_query(), 'RLQUERYsys_user_has_role.user,=0^ENDRLQUERY')
gr.query()
self.assertGreater(gr.get_row_count(), 1)
self.assertLess(gr.get_row_count(), 10)
self.assertGreater(gr.get_row_count(), 2)
self.assertLess(gr.get_row_count(), 8)

def test_rl_query_advanced(self):
client = ServiceNowClient(self.c.server, self.c.credentials)
gr = client.GlideRecord('sys_user')
qc = gr.add_rl_query('sys_user_has_role', 'user', '>0', True)
qc.add_query('role.name', 'admin')
self.assertEqual(gr.get_encoded_query(), 'RLQUERYsys_user_has_role.user,>0,m2m^role.name=admin^ENDRLQUERY')
gr = client.GlideRecord('sys_user_group')
qc = gr.add_rl_query('sys_group_has_role', 'group', '>0', True)
qc.add_query('role.name', 'LIKE', 'admin')
self.assertEqual(gr.get_encoded_query(), 'RLQUERYsys_group_has_role.group,>0,m2m^role.nameLIKEadmin^ENDRLQUERY')
gr.query()
self.assertGreater(gr.get_row_count(), 10)
self.assertLess(gr.get_row_count(), 25)
self.assertGreater(gr.get_row_count(), 2)
self.assertLess(gr.get_row_count(), 8)

19 changes: 8 additions & 11 deletions test/test_snc_api_write.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ def test_crud(self):
# We have validated inserting works, now can we update.
# find us a user to change the opened_by field that isn't us
user = client.GlideRecord('sys_user')
user.add_query('sys_id', '!=', 'javascript:gs.getUserID()')
user.query()
self.assertTrue(user.next())
self.assertTrue(user.get('26fbff173b331300ad3cc9bb34efc4bd')) # problem.admin
self.assertNotEqual(user.sys_id, gr.get_value('opened_by'), 'what this shouldnt happen')
#print(f"new user id is {user.sys_id}")

Expand All @@ -36,11 +34,10 @@ def test_crud(self):
self.assertTrue(gr2.get(res))
#print(f"pre-update {gr2.serialize(display_value='both')}")
self.assertTrue(bool(gr2.active))
gr2.active = 'false'
self.assertTrue(gr2.changes())
self.assertFalse(bool(gr2.active))
gr2.short_description = "ABCDEFG0123"
gr2.opened_by = user.sys_id
self.assertTrue(gr2.changes())
self.assertEqual(gr2.get_value('short_description'), "ABCDEFG0123")
gr2.assigned_to = user.sys_id

#print(f"mid-update {gr2.serialize(display_value='both')}")
self.assertIsNotNone(gr2.update())
Expand All @@ -49,16 +46,16 @@ def test_crud(self):
# now we expect our record to be different, locally
self.assertTrue(bool(gr2.active)) # server-side forces it to stay true
self.assertEqual(gr2.short_description, 'ABCDEFG0123')
self.assertEqual(gr2.opened_by, user.sys_id)
self.assertNotEqual(gr2.get_display_value('opened_by'), first_user_display)
self.assertEqual(gr2.get_display_value('opened_by'), user.get_display_value('name'))
self.assertEqual(gr2.assigned_to, user.sys_id)
self.assertNotEqual(gr2.get_display_value('assigned_to'), first_user_display)
self.assertEqual(gr2.get_display_value('assigned_to'), user.get_display_value('name'))


# and if we re-query
gr3 = client.GlideRecord('problem')
gr3.get(res)
self.assertEqual(gr3.short_description, "ABCDEFG0123")
self.assertEqual(gr3.get_display_value('opened_by'), user.get_display_value('name'))
self.assertEqual(gr3.get_display_value('assigned_to'), user.get_display_value('name'))

gr4 = gr3.pop_record()
gr4.short_description = 'ZZZ123'
Expand Down
Loading