mirror of
https://gerrit.googlesource.com/git-repo
synced 2024-12-23 07:16:21 +00:00
70c54dc255
The upload module tries to turn the strings into bytes before passing to EditString, but it combines bytes & strings causing an error. The return value might be bytes or string, but the caller only expects a string. Lets simplify this by sticking to strings everywhere and have EditString take care of converting to/from bytes when reading/writing the underlying files. This also avoids possible locale confusion when reading the file by forcing UTF-8 everywhere. Bug: https://crbug.com/gerrit/11929 Change-Id: I07b146170c5e8b5b0500a2c79e4213cd12140a96 Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/245621 Reviewed-by: David Pursehouse <dpursehouse@collab.net> Tested-by: Mike Frysinger <vapier@google.com>
61 lines
1.6 KiB
Python
61 lines
1.6 KiB
Python
# -*- coding:utf-8 -*-
|
|
#
|
|
# Copyright (C) 2019 The Android Open Source Project
|
|
#
|
|
# 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.
|
|
|
|
"""Unittests for the editor.py module."""
|
|
|
|
from __future__ import print_function
|
|
|
|
import unittest
|
|
|
|
from editor import Editor
|
|
|
|
|
|
class EditorTestCase(unittest.TestCase):
|
|
"""Take care of resetting Editor state across tests."""
|
|
|
|
def setUp(self):
|
|
self.setEditor(None)
|
|
|
|
def tearDown(self):
|
|
self.setEditor(None)
|
|
|
|
@staticmethod
|
|
def setEditor(editor):
|
|
Editor._editor = editor
|
|
|
|
|
|
class GetEditor(EditorTestCase):
|
|
"""Check GetEditor behavior."""
|
|
|
|
def test_basic(self):
|
|
"""Basic checking of _GetEditor."""
|
|
self.setEditor(':')
|
|
self.assertEqual(':', Editor._GetEditor())
|
|
|
|
|
|
class EditString(EditorTestCase):
|
|
"""Check EditString behavior."""
|
|
|
|
def test_no_editor(self):
|
|
"""Check behavior when no editor is available."""
|
|
self.setEditor(':')
|
|
self.assertEqual('foo', Editor.EditString('foo'))
|
|
|
|
def test_cat_editor(self):
|
|
"""Check behavior when editor is `cat`."""
|
|
self.setEditor('cat')
|
|
self.assertEqual('foo', Editor.EditString('foo'))
|